Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 07:28:39 +0000 (23:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 07:28:39 +0000 (23:28 -0800)

Trivial merge